Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename CMake project to gz #1527

Merged
merged 15 commits into from
Jun 27, 2022
Merged

Rename CMake project to gz #1527

merged 15 commits into from
Jun 27, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Jun 8, 2022 •
edited
Loading

Shared libs

To test the warnings for ignition- prefixed physics engines, try:

$ ign gazebo rolling_shapes.sdf -v 2 --physics-engine ignition-physics-dartsim-plugin           
...                                              
[Wrn] [Physics.cc:760] Trying to load deprecated plugin [ignition-physics-dartsim-plugin]. Use [gz-physics-dartsim-plugin] instead.
...

And for the render engine:

$ ign gazebo shapes.sdf -v 2 --render-engine ignition-rendering-ogre
[Wrn] [ServerConfig.cc:543] Trying to load deprecated engine [ignition-rendering-ogre] for the server. Use [gz-rendering-ogre] instead.
[Wrn] [ServerConfig.cc:574] Trying to load deprecated engine [ignition-rendering-ogre] for the GUI. Use [gz-rendering-ogre] instead.
...
[GUI] [Wrn] [MainWindow.cc:955] Trying to load deprecated plugin [ignition-rendering-ogre]. Use [gz-rendering-ogre] instead.
...

I added a world that tries to load ignition-gazebo prefixed plugins to demonstrate that they still work:

$ ign gazebo deprecated_ignition.sdf  -v 2
...
[Wrn] [SystemLoader.cc:54] Trying to load deprecated plugin [ignition-gazebo-physics-system]. Using [gz-sim-physics-system] instead.
[Wrn] [SystemLoader.cc:54] Trying to load deprecated plugin [ignition-gazebo-user-commands-system]. Using [gz-sim-user-commands-system] instead.
[Wrn] [SystemLoader.cc:54] Trying to load deprecated plugin [ignition-gazebo-scene-broadcaster-system]. Using [gz-sim-scene-broadcaster-system] instead.
...

CMake targets

Since the CMake targets are changing, I took the opportunity to update various parts of the code to use targets instead of other variables. This unveiled places where we were over-linking to things we didn't need, or relying on transient dependencies. That's why this PR has added arguments to target_link_libraries in various places.

@chapulina chapulina added needs upstream release Blocked by a release of an upstream library ign to gz Renaming Ignition to Gazebo. labels Jun 8, 2022
@chapulina chapulina mentioned this pull request Jun 8, 2022
Closed
17 tasks
@chapulina chapulina added the 🌱 garden Ignition Garden label Jun 16, 2022
@chapulina chapulina marked this pull request as ready for review June 16, 2022 17:36
methylDragon
methylDragon reviewed Jun 16, 2022
View reviewed changes
src/SystemLoader.cc Outdated Show resolved Hide resolved
@methylDragon methylDragon mentioned this pull request Jun 16, 2022
Closed
@methylDragon methylDragon force-pushed the gz_cmake_project branch 5 times, most recently from c3e9314 to eababa8 Compare June 26, 2022 01:01
chapulina and others added 9 commits June 25, 2022 23:25
@chapulina @methylDragon
Rename CMake project to gz
c271e9d 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
Link EntityTree against common graphics
89240c1 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
warning for ignition physics engine plugin
d92a38a 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
deprecated ignition prerfixed engines
8a66b0b 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
Support ignition-gazebo systems, with warnings
0e89e29 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
gz-gazebo -> gz-sim
f3baf41 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina @methylDragon
fix examples
8ff4880 
Signed-off-by: Louise Poubel <[email protected]>
@methylDragon
Migrate ign-gazebo- -> gz-sim-
c1e5184 
Signed-off-by: methylDragon <[email protected]>
@methylDragon
Implement flexible replace for ignition plugins
b7d90df 
Signed-off-by: methylDragon <[email protected]>
@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Jun 26, 2022
@methylDragon methylDragon enabled auto-merge (squash) June 26, 2022 06:51
@chapulina chapulina disabled auto-merge June 26, 2022 20:42
@chapulina
Fix string replace logic
d7b07c2 
Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Test fixes
cdad509 
Signed-off-by: Louise Poubel <[email protected]>
@codecov
Copy link

codecov bot commented Jun 27, 2022

Codecov Report

Merging #1527 (cdad509) into main (a3cbd8c) will decrease coverage by 0.01%.
The diff coverage is 99.31%.

@@            Coverage Diff             @@
##             main    #1527      +/-   ##
==========================================
- Coverage   63.62%   63.61%   -0.02%     
==========================================
  Files         330      330              
  Lines       25787    25881      +94     
==========================================
+ Hits        16408    16465      +57     
- Misses       9379     9416      +37
Impacted Files Coverage Δ
include/gz/sim/EventManager.hh 79.16% <ø> (ø)
include/gz/sim/Util.hh 100.00% <ø> (ø)
include/gz/sim/detail/View.hh 100.00% <ø> (ø)
include/gz/sim/gui/GuiEvents.hh 0.00% <ø> (ø)
include/gz/sim/components/Factory.hh 97.53% <80.00%> (-1.18%) ⬇️
include/gz/sim/EntityComponentManager.hh 100.00% <100.00%> (ø)
include/gz/sim/Link.hh 100.00% <100.00%> (ø)
include/gz/sim/Model.hh 100.00% <100.00%> (ø)
include/gz/sim/SdfEntityCreator.hh 100.00% <100.00%> (ø)
include/gz/sim/Server.hh 100.00% <100.00%> (ø)
... and 129 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update caa20c1...cdad509. Read the comment docs.

@chapulina
Copy link
Contributor Author

No new test failures! 🚀

@chapulina chapulina merged commit b559eb6 into main Jun 27, 2022
@chapulina chapulina deleted the gz_cmake_project branch June 27, 2022 00:47
@j-rivero j-rivero mentioned this pull request Sep 16, 2022
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@methylDragon methylDragon methylDragon approved these changes

@mabelzhang mabelzhang Awaiting requested review from mabelzhang mabelzhang is a code owner

@iche033 iche033 Awaiting requested review from iche033 iche033 is a code owner

@azeey azeey Awaiting requested review from azeey azeey is a code owner

Assignees
No one assigned
Labels
🌱 garden Ignition Garden ign to gz Renaming Ignition to Gazebo.
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@chapulina @methylDragon